bug fixes in code
Merge pull request #1 from anehrkor/alex

ok...
merging new master into alex