Merging Development Branch

This is what makes it work on Cloud9