Experimental branch
added copyright and javadocs
bring changes to master