minor bugfixes
Merge pull request #6 from aebrahim/aePR1

minor bugfixes