Merged working_copy and master
Merge branch 'master' of https://github.com/ACK012/bubbie