bug fix
bug fix
Merge pull request #13 from seacloud9/master

bug fix
Merge branch 'master' into gh-pages