Merge pull request #2 from spacedockapp/master

Merging master down to fork
Resolving issue 171, Implementing partial wave 10
Merge pull request #172 from tblackwe/master

Merging issue 171 resolution and partial wave 10 implementation