Merge pull request #1 from chrshffmn/master

bampfa-155