Squashed commit of the following:

commit ee232dfc657d89fb6e0cae42ad3574db3ee96d64
Author: ypodo@yahoo.com <ypodo@yahoo.com>
Date:   Mon May 27 20:09:17 2013 +0300

    upversioning