Fix for issue 134
Merge pull request #2 from peej/master

Getting Latest changes