Implement changes

Fix #17