Merge pull request #41 from dildick/master

Merging updates
Merge pull request #4 from gem-sw/master

Merge pull request #41 from dildick/master