Merge pull request #1 from okuligowski/dev

Dev
Merged with new api header.
Merge pull request #24 from tpasternak/dev

Dev