new changes, too tired to comment
Merge branch 'master' of https://github.com/blin17/Collab_2013