Merge pull request #61 from unixorn/master

Update master after merging #60