bug fixes in code
merging new master into alex
Merge pull request #2 from anehrkor/alex

Alex