Issue 14

Fix #14