Merge pull request #4 from k-joseph/master

Merging Tobin's team's code into our repo
fixed null pointer exception