Merge pull request #1 from baasbox/master

update from origin
Revision up to line 676

up to line 676
Final revision
Merge pull request #99 from mOzzrella/master

Final Revision 0.8.3