Refactored method to reduce complexity. Fixes #19
Build
Versioning update