V2

Not much change, gearing up for big update soon.
Merge pull request #2 from team1626/master

V2