Merging changes made in 1.1.0 release from SVN.
Fixes #1.
Merge pull request #4 from aik099/master

Merged changes from SVN release 1.1.0