Fixes #18 #30

Open
wants to merge 1 commit into
from
Commits on Apr 3, 2013