Merge pull request #4 from hirunatan/master

Some last changes