Close #21 - quick and dirty solution.