2016.3.16

* Get rid of the Air dependency
* Rewrite using common Haskell coding convention