favadi Merge pull request #15 from dholm/master …