merging
added functionality, fixed path error