Version 2

version 2 should merge with the master branch!