update from stymy's repo
new files added