Merge pull request #58 from hspak/master