Merge pull request #5 from rudisimo/master

Misc update