Merge pull request #41 from dildick/master

Merging updates