Squashed commit of the following:

commit f46b1ad09baf6eba7878c04dcda5a2fab18a87ef
Author: Mayk Choji <mayk.choji@gmail.com>
Date:   Tue Nov 25 18:42:45 2014 -0200

    Tools done. Need revision.