applies apsb13-27
Merge pull request #40 from dcepler/master

applies apsb13-27