getnikola/nikola — pull request #1040 by ramiro (2014-02-09 00:42:17+00:00)
Title: #936 rebased & expanded

This a rebase of @Gunmos 's PR 936 to current master status.

Also, last commit adds some additional guards. Feel free to ask for a undo if you consider they aren't worth/correct.