Merge pull request #82 from tawarisch/Master_new

Master new