Fixes #1, closed#1