now applies apsb14-23
Merge pull request #41 from dcepler/master

now applies apsb14-23