fiximg errors
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge pull request #44 from rackeric/master

 fixing errors