Merge pull request #53 from FWAJL/master

Merge