Merge pull request #39 from kshah2451/master

Merge pull request #38 from kshah2451/BTowns
finally fixed all merging i hope
Merge pull request #40 from kshah2451/BTowns

This is the for real merge with updates