FIxes Issue#180
Merge pull request #216 from kongsally/master

FIxes Issue#180