Reviewed
Reviewed
fix many things
Merge pull request #14 from baasbox/master

pull from master