Implement with X-Tag library

This is an implementation of the master branch, but using the [X-Tag](http://www.x-tags.org/) library. It addresses issue #11