Merge pull request #22 from rasmushaglund/master

pull
Api fix
Merge pull request #23 from rasmushaglund/master

pull
Api fix
Merge pull request #148 from RikardNordstrom/master

api pull