Merge pull request #9 from ngsutils/working

Working