v.04
Merge pull request #2 from mamod/bugs

v.04