general fixes
Merge pull request #12 from seacloud9/master

general fixes