general changes
Merge pull request #11 from kamandah/master

general changes