jautero/konopas — pull request #1 by jautero (2014-08-06 10:13:49+00:00)
Title: Updates in upstream since fork

Merging upstream