apply apsb13-13
Merge pull request #36 from dcepler/master

Applies APSB13-13