Update
Merge pull request #18 from antbanks2014/master

Update