fixed #42
fixed #56
Merge pull request #57 from andrewvergel/dev

Dev