applying apsb13-10
Merge pull request #35 from dcepler/master

Now Applies APSB13-10