Merge pull request #1 from l1x/version_2_x

Version 2 x preview
Never saw this coming