2d version of the API
Conflicts solved
Merge pull request #25 from Sbfrr/0.0.2

2d version of the API