applies APSB13-19
Merge pull request #38 from dcepler/master

Apply APSB-13-19