jberkel Merge pull request #7 from davidraj/master