Bumped version number to reflect additions
Merge
Merged with master