Merge pull request #2 from janm399/master

Removed type aliases and specified proper return types