Big commit - re-organized switch case and new implementations
Merge pull request #23 from cbwiedel/master

Big commit - re-organized switch case and new implementations