Some Changes, Closes #1