Fixed two errors to solve #22