Version 2 update
Merge pull request #21 from niven01/code

Version 2 update