Merge pull request #1 from jatyin1994/master

pull b1
Merge pull request #1 from rowantyj/master

pull b1 second attemp