merge
Merge pull request #7 from mean2k/noBugs

merge