miscellaneous updates
Merge pull request #16 from Dhiru/master

miscellaneous updates
huge change on beta git
well done dhiru