Merge pull request #1 from rowantyj/master

pull b1 second attemp
Merge pull request #7 from jatyin1994/master

Pulling to you...