Merge pull request #8 from baslr/master

pull from remote