Merge branch 'master' of https://github.com/junqueira/finan

* 'master' of https://github.com/junqueira/finan:
Merge branch 'master' of https://github.com/junqueira/finan

* 'master' of https://github.com/junqueira/finan: